Fix compatibility for RC > 0.8.1