Bit of a fix up