Fix cross generation