Fixing getting data