Solved #59
Solved #59