Fix SetHill logic