Fork : ChannelStates fix (SiggiK patch V2)