Gnagna's fix