Bugfix - mind your data structures