Bug with generator init repaired