[MAT-358] Correct visibility