Controller changes
Bugfix of cb plugin