issue #51 bug fixed