[#2669] Tweak thanks to @WouterJ