[#54] Solve problem