[#98] Solve problem