r735: fixed a bug caused by merge