Moved Fact.while out of src