(#3193) - Follow up to fix default  option