Even more attempts at fixing the translation issues...