Fix wrong datastructure