fix logic
fix notification destination