RM fix for JIRA issue [1342]