Fixed multiple subscription issue