Fixing the broken build