Bug fix to run on data.