PEP bugfix