bugs fixed at generator