Fix bug on data channel