Fixes #1198 - Needs to be tested before 2.0.2
Buffer overflow in Companion Wizard