Xanewok Merge pull request #1020 from kngwyu/racer-pm-fix …