[#121] Solve problem