Return fix #12032
removed some redundancy
removed some redundancy