Fix issue CAT-1061