Merge pull request #167 from int-brain-lab/hotfix/2.11.2

Merge pull request #167 from int-brain-lab/hotfix/2.11.2 #186