Fix issue with stage 1.