Fix structure. Still not working.