Yes, allowing the range restrictions to fall after a certain amount of meter is a more elegant solution.