Hopefully final fix for Issue #1