Bit of a hacky compilation fix, need to revert later