Fix bug #226
Merge branch 'issue_226' into feature-zm_all