fix bug after merge