re fixes #5 for s4 and s2