export bugs fix