Handle duplicate values better
1.4.4