Solved #41