debug message fix
Export fix