fix for datastructure