Better fix (forgot to test lol)