fixed pop/push issue