Fixed Shelf deadlock