fix import bugs from previous commit