Bugfix re-init