Fix in typechecking
#462
+147
−63
Merged
in typechecking
#462
in typechecking
#462