Fix #14

Ref #14