Solved #95