Corrected order of setup push