fix for https://jira.spring.io/browse/RCP-613