Adding a missing check for subtype