#3261 updated docu matching code fix