LP#1371647: fix thinko with ID re-pinning