Fix compatibility issue