bug fix refactored import