improved workaround for codegen bug - this restores the full functionality.
1 file changed