Quick fix for Issue #34