bugs fixed for enabling new generator