fix returned values when asking for last values