Fix s2w from @jmztaylor