Fix for https://webarchive.jira.com/browse/ARI-4024
Merge pull request #39 from vonrosen/ari-4024

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