Merge pull request #1033 from colincross/failed