merge bug fix by gcniu