Fix bug #223
Merge remote-tracking branch 'matthias-ronge/issue_223' into feature-zm