Hack to get build working