Dynamishelper: Possible fix
Merge pull request #558 from z16/4.1

Dynamishelper: Possible fix