fix bug caused by merging master