[artf693575] Walktrough Bug Fixing