structure fixed. fixes #1