#261 adjusted generator.