Fix bug #219
Merge remote-tracking branch 'origin/issue_219' into feature-zm_all