Removed the 'feature' to run on the request.delivery, as this clearly creates recursion.