Better preserve original state