Stable commit. Issues with multiple same values causing crash