Model fix, generator fix