Bug fixing: Export MVP