Added Fix for Step 5