Fix to avoid error messages
Merge branch 'develop' of https://github.com/buttleofx/ButtleOFX into develop