2nd pass at fixing: https://github.com/ISeeDEDPpl/Questor/issues/505