Fix fail state
Merge pull request #901 from ahomatthew/develop

Fix fail state