Bugfix when data is empty