build(gen) - Common index corrected