Move everything to init to prevent further issues