Small bug fix import-related