Fix generate