Bug correction after merge