6 bug fixed