fix data extraction from fragments