Fix compatibility support