[BUGFIX] Same fix as before, different place