Manual fix export