Merge pull request #65 from heftig/pc-fix2