Updated changes

Updated changes after fix