Temp Fix for Issue #239