Fix bug when pushing and coming back