Just-in-case commit 2

Because BSOD