Refactor. Avoid flickering notification.