Bug fix for handling header pull