1 bug fixed