Add functionality to cope with +P channels. Fixes a crash.