Fix to https://issues.apache.org/jira/browse/WAVE-415