Fix for Issue #612