Fixing the build #34