fixed issue with header and body