Changing visibility according to the discussion on issue #586