Merge branch 'fix-issue-233'