bug fixing on notification sending