Fixed bug with leaky service connection.
Buggy but working rich notification.