Duplicated delivery fixed