fixes #24
More PEP fixes, fixing #24