Updated to hopefully be compatible with st3.