fixed merge #2739