Aaaaand here's the patch!