Fixing step 2