Fixes
step2