Fixed not initializing on load