Third fix for Arch patch (context.c).