fix for Issue #1667 broke some tests