* fix data access