Make order of modifiers consistent