Fix onInitialize