Bit of a hack, but only temporary