Fixing the range issues reported