fix bug resulted by merging