[#87] Solve problem