Fixed generators

Test code on wiki