bugfix: data loading