[visibility] fix after Arnaud comments