Feature/quint/#28 export fix