Solved #75

Solved issue #75