Same fix as previous commit, only a bit cleaner.