Same fix, but better