Fix issue #1
Ref #2