#8 bug fixed