Fix related to last change to cleanup_value