Fixed problems with the last push