Fixes #1955 unique can now specify the scope