Merge: problem with new id of header fixed