It's probably time for this patch