bug fix for DID 123456
merge back from bugfix