Hotfix for bug #221

Hotfix for bug #221