Fix compatibility 0.85