Resolve issue #114

Resolve issue #114