Fixed bug with Unique button