Edit: uniquify now works