fixed delivery fixed #23