Feature/fix export