Merge pull request #1262 from Korri/develop

Fix Issue #627