ver1.0 bug fixed