Saved another class from the menace of the PR