Attempt at build fix