A quick fix for JIRA resolution ticket #75