Fixes pep1/kitchenoffice#16