Fix default value issue
Merge pull request #1450 from ke-yu/fix_defaultvalue

Fix default value issue