Issue 2 donefail support