[#2832][#2775] Slight fix thanks to @WouterJ