Fix compatibility break