add quotation for when clause.
Merge branch 'develop'