Fix for http://jira.tizzit.org/jira/browse/TIZZIT-450