Fixing the build failure