Fixing a building issue