fixes #2868
Merge pull request #2870 from digi604/fix-2868

fixes #2868