C5 mohamed shaban #45 notification bug fix