Geraint's broken number patch applied