fix import issue + bug