Fix Issue #8