Fix loading state issue.
Merge pull request #1 from rjackson/fix_loading_states

Fix loading state issue.