Fixes bug in scenario construction