Adding headers to avoid possible errors