add first check
fix headers