fix modifier order