Made compatible with older export format fixes GH-99