hotfix refs #366
Merge branch 'hotfix/id/366' refs #366