Fix bug #226
Merge remote-tracking branch 'matthias-ronge/issue_226' into feature-zm