Fix import bug caused by refactor