Fix to ensure type matching on conventions is to the exact type