Fix onLoad workflow