Fix merge problem. fix #2064