[#81] Solve problem