Make it work for ES 1.0.1