[#82] Solve problem