Add additional type check