Fix bug with move uniqueness