Issue #8 is now Issue #17