[FIX] pass context in delivery