One more fix for Issue #12