Bugfix
Better data extraction