fix for Issue #372