better handling of unsafe values
bump