Dense_Rank() would be a better choice for your windowing function as it would permit duplicate values to exist in your data islands.