Fixed bugs with pushing