Further fix for the channel regression

Created by  Eelco Dolstra  on November 2, 2015
4OYAYGKNWOFE2Z6L6WHEWNRAQBKWDW4AUCVZ5T7XRT3EB74KVEHAC
Change contents