Export Fix