Bugfix with supervisor