eamad: Use the correct headers