Tentative fix for double notification bug