More attempts at fixing the problem