I applied the fix without testing as I generally trust q0rban on theming and I don't have time to test this properly