FIX: features from original headers are now preserved.