minor fix in generator (and temporary TODO added)