FLEX34324: accept patch from Chris Martin