fix for issue #1395
Merge pull request #1400 from gsomix/develop

Fix for issue #1395