bugfix in data structure