fixing startup fair issues
Merge pull request #239 from ClareCat/master

fixing startup fair issues