Fix structure pattern