Make Aya working again.