Double notification creation fix