Moved some code around. I broke Push :-)