S4 fix attempt #5