Fixed zero removal bug