Hotfix rollback checkConvention()