Fix for quantity 0 removal