solved issue #34