Luis Barreiro Can we make sure the new enhancer does not run into this? Gail Badner up to you if you want to implement a fix in the old enhancer for 4.x...