Fix galaxies tracking