Bug fix for bug # 1124129
Merge pull request #2 from matthias-ronge/bug-1124129

Bug fix for bug # 1124129