Solved #85 issue