ES-179 bug fixed