Fixed the no builder selected bug