FIX fields improvment