Fix pinned handing