Temporary Fix Issue #1