#357 Made the two scenarios fail a little less...