[#112] Solve problem