Bugfix/channel12