[#78] Solve problem