Little tweaking to Abandonment

Backported from Async