Fix multiple subscription bug