Fix issue #12

Finally, discovered how to fix this.