fix correctness issue from comprehensive #2353