ES-918 fixed