EXTRACT_CONTRIB_GIVEN.. bugfix