[#2720] Tweaks thanks to @WouterJ