No idea if it has actually caused any uninteded behaviour, or if this
fix now then causes something to break.