ES-934 fixed