Re #1310 Fixing 0 value error.