Fixed overcheck twice issue