Fix structure reading