fixes #825
fixes #825
Merge pull request #828 from enesakar/improv/3.1/issue-825

fixes #825