Hopefully fix typecheckedOn bug