Making this work for ES 0.90.0.RC2