Fixed issue 139
Further correction
Merge branch 'ra3xdh-issue139fix'

Close issue #139