Bug fix for multiple header issue