Better solution, sorry