push/pop error fixed?