fix - Null will not be converted to 0