bug fix for DID 123456