S4 patch - credit kszaq