shelf removal bug fix