Additional type-check