Temporary fix for Issue #69