[#124] Solve problem