Avoid unbalanced loading events
Merge pull request #18 from LocalData/loading

Avoid unbalanced loading events