sync up with es 1.2.1