fixing wrong order