stage1 fix