Adding handling of zero values