Eliminated adding subscribers issue