Merge pull request #2641 from aanbar/develop

Fixed issue #2638