Bug fix to data grabber