fixing lookup table map to avoid references to deleted data
Merge commit '5e88af580d6f734b6f4f2bbbbde2cc6456136e10'