Logical fix which could crash the bot
Merge branch 'master' of https://github.com/OHSystem/ohsystem