Fix for: https://github.com/ISeeDEDPpl/Questor/issues/564