subscrib notification and bug fix