Fixes issues in CloseShieldChannel
#799
+61
−10
Merged
CloseShieldChannel
#799