Created
Fixed handling zero values