[bugfix] fix on problem comes from merge