Fix possible case_clause error
Merge remote-tracking branch 'chrisavl/master'