Fix for service notification