Better support for zero adding