fix remove from shelf scenario