Redo transformer fix - sonar is wrong and has a jira from July on the issue

Redo transformer fix - sonar is wrong and has a jira from July on the issue #489