Fix for breaking ES 0.90 change