Fixed modifiers handling