Issue #10 is now Issue #18