fixed a loading problem introduced in 1.0.2
Merge branch 'original-master'

* original-master:
  fixed a loading problem introduced in 1.0.2