Fixing cloudy notification granularity, #216