Resolve double init bug