Fix for JIRA 536