stage 2 fix