Resolved <export> tag issue