Fix #10

NOTE
This will not work without the fix to issue #6.