Improve restoring behavior