Fix for https://webarchive.jira.com/browse/ARI-3917