Fix notifications not being delivered correctly (fix #153)