Code adjustment made for ES-1007
Fixation made for ES-1007