Aya fix again....