Fixed the pass to and from of the data.