Fix, or rather work around an ages old double-free crash which sometimes