BUG Fix in Step 5