Fix Issue #2