issue #30 bug fixed