Bugfix single control