Fix bug #219
Merge remote-tracking branch 'matthias-ronge/issue_219' into feature-zm