bugfix because of changes in data structure