Speeding up this patch

Yes, I know, it's a bit hackish. We can and will fix that