test fix
instanceof code fix