added proper values back