fix #2385
Merge pull request #2422 from digi604/fix-2385

fix #2385