Solves https://issues.apache.org/jira/browse/WW-4113