hotfix and add headers