Fix compatibility