Properly fix GH-96