Fix for https://www.objecthunter.net/jira/browse/EXP-25