fix a reload issue
Merge pull request #2421 from FinalAngel/develop

Develop