Solved #69