Problem with struct composability

Fixes #619.