Fix after latest update