bug fixed ver. 1.0.0.1