minor bugfixing to adhere PEP-3110