Fix to work on 0.90.2