Fix cut-n-paste-o
Merge pull request #331 from ajps/restruct

Fix cut-n-paste-o