Increase uniqueness [#21]
1.6.4