add local handling for notify fix #1112