Fixed custom generator