Switched to direct access of $fields property instead of using fields()