Fix regression with multiple clefs