[TIDOC-1897] Fix