Fixes on step 7
Fixes
Fixes #2