Quick fix for Issue #21.