NSF: Death penalty fix on the fast track

NSF: Death penalty fix on the fast track