Fixes stage 1