Applied https://github.com/k7k0/wsf/commit/802768ad2798a8c467a1e74f6933694459881c7c.patch