Fix for item pin/unpin regression