#99 bug fixed