[#125] Solve problem