sug-281 restrict_value option fixed