Still fixing stupid reset problems!