[#97] Solve problem