solved issue #39