GH #97 - No guaranteed delivery for 2.0