Should Fix Issue #1