Slays enterprise dragons, fixes #4