Fixed missed/wrong saved variables