Merge "Fix modifier ordering"