Fixed: moved @fields one layer up