ZH2006Swiss - minor fix -OQ ready