fixes #2650
Merge pull request #2655 from digi604/fix-2650

fixes #2650