@shacker see https://jira.media.berkeley.edu/jira/browse/CLC-1165
They also need to be in separated statements as they were before.