Fixed #2444 Fixed some bug about merged the  code