Issue #503 Fixing scenario and indentation