Pro Tip: Double check Matthias's PRs

1117