Fixed issue where cluster visibility would be misrepresented

@anshprat Please review these changes.