Fix wrong ordering