Fixed ordering bug in imports