Yeah it seems it is the only way to bypass this bug...