Make compatibkle with 0.9.2