Fix issue with init() being called twice