bugfix: change of structure definitions