Improved robustness to handle IGEN tables