b/f: fix wrong generated contact (also part of 23c638ee b/f: errors with wrong Contact-HF)

also thanks to Carsten Bock for the report