Fix for: github.com/ISeeDEDPpl/Questor/issues/536