Merge pull request #1017 from root-expert/safe-facts