fix struct types

See #15.