Solved issue #34