-Fixed the order of previous commit if.