[#88] Solve problem