Pop/push fix