Use the default value instead of null value