fixed bug, jira ticket number ABM-218

Signed-off-by: John Mulholland <john.mulholland@rsginc.com>
Merge branch 'bugfix-218' into develop