message fix and notification create