Add future proof notification bug fix (in case GBS fixes a notification bug)