Actually fixing STFS.