Resolve issue #12

Resolve issue #12