Fix Issue #6