Add an additional type check