Fix for buildhive