fixing import / export bugs