fix push, move final cr to outside compile