fixes #724
Merge pull request #728 from magfest/teardown_night_fix

fixes #724