Fixes issue with CategoryValue & fill_value