Fix gen problem