Fix: Issue where alternate usp can be used for headers. #1456