fix for Issue #547