Solved #60