#6 bug fixed