Fixed S2W not working if DT2W was not enabled