Fix startup error
Fix startup error
Merge pull request #1279 from Skillert/minor

Fix startup error