Bug correction in export