Merge pull request #1792 from Lukasa/oops