fixes #806
Merge pull request #809 from enesakar/improv/3.1/issue-806

fixes #806