fix header / instantiation part, #24