fix default value checking
Merge branch 'module/choose' into dev