issue #24 bug fixed