PEP compatibility fixed