Not sure if this is the right way to handle this, but it makes the save states perfectly stable. That's all that really matters, right?
