[#119] Solve problem