[29958] issue fix