Bug fixing on imports