Fix bug on step 3