better ranges
Merge branch 'hotfix/range-issue'