Possible build fix