Bugfix: correctly load data