Fix #21 - Always correctly show notifications