[#2092] Tweaks thanks to @bschussek