Fixed changes in last bad commit