[#118] Solve problem