Use new method to keep 0 correct