fix overfolw issues