Fixed bug on setting values back