Allow for elastic 0.9