fix all bugs without test