Fixing issue with re-init;