[HOTFIX] hotfix

hot fix A, B, C