(dev_bugfix) for the defect 123