fix #3696 (too much simplification)