Solved export issues