fixed error caused by last merge