Fixing data handling bug.