Hopefully, a fix for ÅA issues