added rangeFix for all fields