Fix up to zero problem