2 bug fixed