Fix issue where some behavior provided fields were not supported