Fixed issue

issue #22