Correction of the use_masks and correct use of has_scales