s_quit crash fixed (again)