Workaround reload issue