defstruct fix