[#3342] Tweaks thanks to @bicpi and @xabbuh