fix infinite recursion, more consistent type check

fix infinite recursion, more consistent type check #644