Fix potential of UTC fail after notify patch merged