Bugfix multi-system