[#001] - added checking fields