Fixing Build Bug