Channel Layout fix