Solved #42