working PEP fixed