remove is_integer call in resolve_values