change way of resolving remote notifier