Additional fix for Issue #256