Fixed notification handler issue
Small optimization