BUG-731: fix order of modifiers