Resolve issue #221

Resolve issue #221