Re-adding correct uniqueness behavior