Fix compatibility bug