Fixed ordering of commits