Fixing JIRA ticket # 79