Fixing issue with build