[#73] Solve problem