FMS-332 - Fix range inconsistency when having possible duplicates