diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt
index bf8c078c38..e289b1c034 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt
@@ -185,10 +185,17 @@
 ;; new information found from type-checking. Only used when an expected
 ;; type was not provided.
 (define (merge-types self-type method-types)
-  (match-define (Instance: (and class-type (Class: _ _ _ _)))
+  (match-define (Instance: (and class-type (Class: #f inits fields methods)))
                 self-type)
-  ;; FIXME: this is an incorrect stub implementation
-  class-type)
+  (define new-methods
+    (for/fold ([methods methods])
+              ([(name type) (in-dict method-types)])
+      (define old-type (dict-ref methods name #f))
+      ;; sanity check
+      (when (and old-type (not (equal? old-type type)))
+        (tc-error "merge-types: internal error"))
+      (dict-set methods name type)))
+  (make-Class #f inits fields new-methods))
 
 ;; local-tables->lexical-env : Dict<Symbol, Id> Dict List<Symbol>
 ;;                             Dict<Symbol, (List Id Id)> Dict List<Symbol>
@@ -218,15 +225,15 @@
       (->* (list (make-Univ))
            (if maybe-type
                (fixup-method-type (car maybe-type) self-type)
-               (->* (list (make-Univ)) (make-Univ))))))
+               (make-Univ)))))
   (define field-get-types
     (for/list ([f (set->list field-names)])
-      (define maybe-type (dict-ref fields f))
+      (define maybe-type (dict-ref fields f #f))
       (->* (list (make-Univ)) (or (and maybe-type (car maybe-type))
                                   (make-Univ)))))
   (define field-set-types
     (for/list ([f (set->list field-names)])
-      (define maybe-type (dict-ref fields f))
+      (define maybe-type (dict-ref fields f #f))
       (->* (list (make-Univ) (or (and maybe-type
                                       (car maybe-type))
                                  -bot))
@@ -238,17 +245,19 @@
 ;; check-methods : Listof<Syntax> Dict Type -> Dict<Symbol, Type>
 ;; Type-check the methods inside of a class
 (define (check-methods meths methods self-type)
-  (for ([meth meths])
+  (for/list ([meth meths])
     (define method-name (syntax-property meth 'tr:class:method))
     (define maybe-expected (dict-ref methods method-name #f))
     (cond [maybe-expected
+           (define pre-method-type (car maybe-expected))
            (define method-type
-             (fixup-method-type (car maybe-expected) self-type))
+             (fixup-method-type pre-method-type self-type))
            (define expected (ret method-type))
            (define annotated (annotate-method meth self-type method-type))
            (tc-expr/check annotated expected)
-           (list method-name method-type)]
-          [else (list method-name (tc-expr/t meth))])))
+           (list method-name pre-method-type)]
+          [else (list method-name
+                      (unfixup-method-type (tc-expr/t meth)))])))
 
 ;; Syntax -> Dict<Symbol, Id> Dict<Symbol, (List Symbol Symbol)>
 ;; Construct tables mapping internal method names to the accessors
@@ -388,6 +397,19 @@
      (make-Function fixed-arrs)]
     [_ (tc-error "fixup-method-type: internal error")]))
 
+;; unfixup-method-type : Function -> Function
+;; Turn a "real" method type back into a function type
+;; FIXME: this is a really badly named function
+(define (unfixup-method-type type)
+  (match type
+    [(Function: (list arrs ...))
+     (define fixed-arrs
+       (for/list ([arr arrs])
+         (match-define (arr: doms rng rest drest kws) arr)
+         (make-arr (cdr doms) rng rest drest kws)))
+     (make-Function fixed-arrs)]
+    [_ (tc-error "fixup-method-type: internal error")]))
+
 ;; annotate-method : Syntax Type -> Syntax
 ;; Adds a self type annotation for the first argument and annotated
 ;; the let-values binding for tc-expr
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/class-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/class-tests.rkt
index f3bca16694..4fe3e7b641 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/class-tests.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/class-tests.rkt
@@ -325,6 +325,20 @@
                    0)))
     (send (new c%) m 5))
 
+   ;; fails, because the local call type is unknown
+   ;; and is assumed to be Any
+   (check-err
+    (class: object% (super-new)
+            (define/public (m) (n))
+            (define/public (n x) 0)))
+
+   ;; test type-checking for classes without any
+   ;; internal type annotations on methods
+   (check-ok
+    (define c% (class: object% (super-new)
+                 (define/public (m) 0)))
+    (send (new c%) m))
+
    ;; test fields without expected class type
    (check-ok
     (define c% (class: object% (super-new)