Fixed structure issue