RPV-144 Further fix for the 'lost' data issue.