fixed range issues