Fix for JIRA issue SGF-236