This should fix the build hang