Fix to PEP-008