Bug fixing. MVP export