[#111] Solve problem