latest export after issue 5 fix