[#99] Solve problem