Fixed issue when there is no subscriber