[#85] Solve problem