push/pop error fixed