Save original values to preserve possible spaces