Possible fix to calm down the Buildhive