Improve nonzero behavior