Added support for 0