Fixed: the reodering was not working correctly