Fix bug: fields attached now, TODO :loack them