Issue #45 finalizes the scenario at last