revert 1388
add a failing test and change the existing test to make it stricter
fix issue #1388 using another way