Attempted to fix bug with getting data