Add hack for orhpan notifications