Ayet another possible heorku fix