Fix over-poping and only push the core once