#61 bug fixed