[#95] Solve problem