Added auto-init when not already initialized