Yes, that sounds exactly like what I encountered. 

Unfortunately the generator classes are locked down on my environment so I cannot edit them for a quick fix.

Good point on raising this to WRC, however, I will reproduce it on IRIS 2025 and report it.

Thanks.