Corrected fields usage