bug fixes Ver2.0