Fixing a build issue