Hotfix for non-case modifiers