Fixing issue with builder