bug fix on reload
Merge branch 'ray'