#2 bug fixed