Avoid reload

From Yonsm's 07091050