Solved #34