fix some PST issue