added workaround to fix broken API (not yet tested)
reverted previous fix, notifications still to be tested