FIX: Fix custom header adding, check for NP