partial fix for Issue 5570