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

Fix for regression from https://webarchive.jira.com/browse/ARI-3888.