Fixed the extractors for the delta functions