fix the angle problem. Be cautious to the replace option.