Fix moons issue