[#83] Solve problem