Fixed issues with reverting to previously saved value sometimes.