Fixing a small bug with the new unpin logic.