[TIDOC-1861] Fix