Step 8 (Creation) fix