fix default field definition handling