Maybe fixed Sentry issue 635, no idea how to test this