Quick hack to get build order correct