BUGFIX: Controller related field change