More fix, and prevent more similar bug