[#90] Solve problem