Fixed concat source for havana branch too