Fix for https://issues.apache.org/jira/browse/FLEX-34189