Temporarily fixed not resolved field type