Fixed wrong dataaccess