Fix handling of part'd nicks